Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CC-29651 Click&Collect integration. #195

Merged
merged 38 commits into from
Nov 3, 2023
Merged

CC-29651 Click&Collect integration. #195

merged 38 commits into from
Nov 3, 2023

Conversation

romanhavrylko
Copy link
Contributor

@private-packagist
Copy link

private-packagist bot commented Oct 17, 2023 •
edited
Loading

composer.lock

Click to show 118 changes in this composer.lock file

Package changes

Package Operation From To Changes
spryker-feature/marketplace-merchant-portal-product-offer-service-points add - 202311.x-dev 6c091ff view code
spryker-feature/marketplace-merchant-portal-product-offer-shipment add - 202311.x-dev 3797d24 view code
spryker-feature/marketplace-merchant-product-offer-service-points-availability add - 202311.x-dev d916006 view code
spryker-feature/product-offer-service-points add - 202311.x-dev 77b38c3 view code
spryker-feature/product-offer-service-points-availability add - 202311.x-dev 1379d06 view code
spryker-feature/product-offer-shipment add - 202311.x-dev f156ea6 view code
spryker-feature/product-offer-shipment-availability add - 202311.x-dev f82fccc view code
spryker-feature/service-points add - 202311.x-dev 9992357 view code
spryker-feature/service-points-cart add - 202311.x-dev 42672b1 view code
spryker-feature/shipment-cart add - 202311.x-dev 383a573 view code
spryker-feature/shipment-product-offer-service-points-availability add - 202311.x-dev 9b96a4a view code
spryker-feature/shipment-service-points add - 202311.x-dev eff9c03 view code
spryker-shop/click-and-collect-page-example add - 0.3.0 view code
spryker-shop/merchant-product-offer-service-point-availability-widget add - 0.3.0 view code
spryker-shop/product-offer-service-point-availability-widget add - 1.0.0 view code
spryker-shop/sales-service-point-widget add - 1.0.0 view code
spryker-shop/service-point-cart-page add - 1.0.0 view code
spryker-shop/service-point-widget add - 1.0.0 view code
spryker-shop/shipment-page add - 1.0.0 view code
spryker-shop/shipment-type-widget add - 1.0.0 view code
spryker/click-and-collect-example add - 0.8.0 view code
spryker/merchant-product-offer-service-point-availabilities-rest-api add - 0.3.0 view code
spryker/merchant-product-offer-service-point-availability add - 0.3.0 view code
spryker/merchant-shipments-rest-api add - 0.1.0 view code
spryker/product-offer-service-point add - 1.0.0 view code
spryker/product-offer-service-point-availabilities-rest-api add - 1.0.0 view code
spryker/product-offer-service-point-availability add - 1.0.0 view code
spryker/product-offer-service-point-availability-calculator-storage add - 1.0.0 view code
spryker/product-offer-service-point-availability-calculator-storage-extension add - 1.0.0 view code
spryker/product-offer-service-point-availability-storage add - 1.0.0 view code
spryker/product-offer-service-point-availability-storage-extension add - 1.0.0 view code
spryker/product-offer-service-point-data-import add - 0.4.0 view code
spryker/product-offer-service-point-gui add - 1.0.0 view code
spryker/product-offer-service-point-merchant-portal-gui add - 1.0.0 view code
spryker/product-offer-service-point-storage add - 1.0.0 view code
spryker/product-offer-service-point-storage-extension add - 1.1.0 view code
spryker/product-offer-shipment-type add - 1.0.0 view code
spryker/product-offer-shipment-type-availability add - 1.0.0 view code
spryker/product-offer-shipment-type-availability-storage add - 1.0.0 view code
spryker/product-offer-shipment-type-data-import add - 0.4.0 view code
spryker/product-offer-shipment-type-gui add - 1.0.0 view code
spryker/product-offer-shipment-type-merchant-portal-gui add - 1.0.0 view code
spryker/product-offer-shipment-type-storage add - 1.0.0 view code
spryker/product-offer-shipment-type-storage-extension add - 1.0.0 view code
spryker/sales-service-point add - 1.0.0 view code
spryker/sales-service-point-gui add - 1.0.0 view code
spryker/sales-shipment-type add - 1.0.0 view code
spryker/service-point add - 1.0.0 view code
spryker/service-point-cart add - 1.0.0 view code
spryker/service-point-cart-extension add - 1.0.0 view code
spryker/service-point-carts-rest-api add - 1.0.0 view code
spryker/service-point-data-import add - 0.6.0 view code
spryker/service-point-search add - 1.0.0 view code
spryker/service-point-storage add - 1.0.0 view code
spryker/service-points-backend-api add - 1.0.0 view code
spryker/service-points-rest-api add - 1.0.0 view code
spryker/shipment-type-cart add - 1.0.0 view code
spryker/shipment-type-product-offer-service-point-availabilities-rest-api add - 1.0.0 view code
spryker/shipment-type-service-point add - 1.0.0 view code
spryker/shipment-type-service-point-data-import add - 0.6.0 view code
spryker/shipment-type-service-point-storage add - 1.0.0 view code
spryker/shipment-type-service-points-rest-api add - 1.0.0 view code
spryker/shipment-type-storage-extension add - 1.0.0 view code
spryker/shipment-types-backend-api add - 1.0.0 view code
spryker/shipment-types-rest-api add - 1.0.0 view code
spryker/willdurand-negotiation add - 1.0.0 view code
composer/semver upgrade 3.3.2 3.4.0 diff
league/oauth2-server upgrade 8.5.2 ⚠️ 8.5.4 ✅ diff
monolog/monolog upgrade 2.9.1 2.9.2 diff
spryker-feature/checkout upgrade 202307.0 202311.x-dev 95235b8 diff
spryker-feature/customer-account-management upgrade 202307.0 202311.x-dev 51bbad9 diff
spryker-feature/marketplace-merchant-portal-product-offer-management upgrade 202307.0 202311.x-dev da34ddb diff
spryker-feature/marketplace-product-offer upgrade 202307.0 202311.x-dev c14e661 diff
spryker-feature/marketplace-shipment upgrade 202307.0 202311.x-dev 7838776 diff
spryker-feature/product upgrade 202307.x-dev 0cff107 202311.x-dev 0cff107 diff
spryker-feature/product-bundles upgrade 202307.0 202307.x-dev 7c00f4f diff
spryker-feature/shipment upgrade 202307.0 202311.x-dev 4bda9d5 diff
spryker-shop/checkout-page upgrade 3.24.0 3.28.1 diff
spryker-shop/checkout-page-extension upgrade 1.4.0 1.5.0 diff
spryker-shop/customer-page upgrade 2.43.0 2.46.1 diff
spryker-shop/customer-page-extension upgrade 1.5.0 1.6.0 diff
spryker-shop/shop-ui upgrade 1.71.0 1.73.0 diff
spryker/application upgrade 3.33.0 3.34.0 diff
spryker/availability upgrade 9.19.0 9.20.0 diff
spryker/category upgrade 5.13.0 5.14.0 diff
spryker/checkout-rest-api upgrade 3.8.0 3.9.0 diff
spryker/dummy-payment upgrade 2.7.0 2.8.0 diff
spryker/error-handler upgrade 2.8.1 2.9.0 diff
spryker/glossary-storage upgrade 1.11.1 1.11.2 diff
spryker/glue-application upgrade 1.57.0 1.58.0 diff
spryker/glue-backend-api-application upgrade 1.4.0 1.5.0 diff
spryker/glue-storefront-api-application upgrade 1.3.0 1.4.0 diff
spryker/locale upgrade 4.1.0 4.2.0 diff
spryker/merchant-product-offer-storage upgrade 2.0.1 2.3.0 diff
spryker/oauth upgrade 2.11.0 2.11.1 diff
spryker/price-product upgrade 4.42.1 4.43.0 diff
spryker/price-product-offer upgrade 1.5.0 1.5.1 diff
spryker/product-bundle upgrade 7.15.0 7.16.0 diff
spryker/product-bundle-carts-rest-api upgrade 1.0.0 1.1.0 diff
spryker/product-offer upgrade 1.8.0 1.10.0 diff
spryker/product-offer-merchant-portal-gui upgrade 2.4.0 2.5.1 diff
spryker/product-offer-merchant-portal-gui-extension upgrade 1.0.0 1.1.0 diff
spryker/shipment upgrade 8.17.0 8.18.0 diff
spryker/shipment-data-import upgrade 1.2.0 1.3.0 diff
spryker/shipment-gui upgrade 2.8.0 2.9.0 diff
spryker/shipment-type upgrade 0.1.1 1.0.0 diff
spryker/shipment-type-data-import upgrade 0.1.1 0.2.0 diff
spryker/shipment-type-storage upgrade 0.1.0 1.0.0 diff
spryker/shipments-rest-api upgrade 1.10.0 1.12.0 diff
spryker/shipments-rest-api-extension upgrade 1.0.0 1.2.0 diff
spryker/zed-request upgrade 3.19.0 3.20.0 diff
spryker/zed-ui upgrade 2.1.2 2.2.0 diff
symfony/flex upgrade v2.3.1 v2.4.1 diff
symfony/polyfill-uuid upgrade v1.27.0 v1.28.0 diff
symfony/security-core upgrade v5.4.29 v5.4.30 diff
symfony/security-http upgrade v5.4.28 v5.4.30 diff

Dev Package changes

Package Operation From To Changes
filp/whoops upgrade 2.15.2 2.15.3 diff
spryker/development upgrade 3.34.5 3.34.7 diff

Settings · Docs · Powered by Private Packagist

abitskil
abitskil reviewed Oct 18, 2023
View reviewed changes
Copy link
Contributor

@abitskil abitskil left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good as the early integration, requires an additional round of review when the feature is stabilized.

Notes:

  • Data import files have to be substituted by demo shop specific ones.

danil.moroz and others added 19 commits October 20, 2023 17:59
CC-31573 FE Integration
848c686
CC-31573 FE Integration
d71425a
@romanhavrylko
CC-29651: merged internal branch.
3adcf2a
@kkicheglovspryker
CC-31565 Integration.
2c022bd
@kkicheglovspryker
CC-31565 Integration.
81444f6
@romanhavrylko
Merge pull request #204 from spryker-shop/bugfix/cc-31565-product-bun…
d762ede 
…dle-in-cc

CC-31565 Product bundles in C&C integration.
Merge branch 'feature/cc-29651/dev-click-and-collect-integration' of h…
70f4b36 
…ttps://github.com/spryker-shop/b2c-demo-marketplace into feature/cc-29651/dev-click-and-collect-integration
CC-31573 FE Integration
5608c34
CC-31573 FE Integration
bf2d61a
CC-31573 FE fix format
5c27aec
@romanhavrylko
CC-29651: added missing data.
c8f8202
@romanhavrylko
CC-29651: merged internal branch.
0148c8d
Merge branches 'feature/cc-29651/dev-click-and-collect-integration' a…
223ff1b 
…nd 'feature/cc-29651/dev-click-and-collect-integration' of https://github.com/spryker-shop/b2c-demo-marketplace into feature/cc-29651/dev-click-and-collect-integration
@dmiseev
CC-31486: Integration.
45fe38e
@dmiseev
Merge pull request #215 from spryker-shop/feature/cc-31486/dev-archit…
b1c33da 
…ecture-refactoring-before-stabilization

CC-31486: Architecture refactoring before stabilization integration.
@dmiseev
Merge branch 'internal' into feature/cc-29651/dev-click-and-collect-i…
83a2224 
…ntegration
@dmiseev
Updated lock file after merging.
442ea8d
CC-31573 FE stabilization integration.
8894665
Merge branch 'feature/cc-29651/dev-click-and-collect-integration' of h…
affc491 
…ttps://github.com/spryker-shop/b2c-demo-marketplace into feature/cc-29651/dev-click-and-collect-integration
FRITS-Kh
FRITS-Kh suggested changes Oct 31, 2023
View reviewed changes
.../default/components/molecules/address-item-form-field-list/address-item-form-field-list.twig Outdated Show resolved Hide resolved
.../default/components/molecules/address-item-form-field-list/address-item-form-field-list.twig Outdated Show resolved Hide resolved
.../default/components/molecules/address-item-form-field-list/address-item-form-field-list.twig Outdated Show resolved Hide resolved
src/Pyz/Yves/CheckoutPage/Theme/default/views/address/address.twig Show resolved Hide resolved
src/Pyz/Yves/DateTimeConfiguratorPageExample/Theme/default/views/options-list/options-list.twig Outdated Show resolved Hide resolved
src/Pyz/Yves/ShopUi/Theme/default/components/molecules/main-popup/main-popup.scss Show resolved Hide resolved
src/Pyz/Yves/ShopUi/Theme/default/components/molecules/main-popup/main-popup.scss Outdated Show resolved Hide resolved
src/Pyz/Yves/ShopUi/Theme/default/components/molecules/nav-overlay/nav-overlay.scss Outdated Show resolved Hide resolved
src/Pyz/Yves/ShopUi/Theme/default/components/molecules/search-form/search-form.twig Outdated Show resolved Hide resolved
src/Pyz/Yves/ShopUi/Theme/default/components/organisms/side-drawer/side-drawer.ts Outdated Show resolved Hide resolved
@romanhavrylko romanhavrylko changed the title [WIP] CC-29651 Click&Collect integration CC-29651 Click&Collect integration. Nov 3, 2023
@dmiseev dmiseev merged commit ebbfc60 into internal Nov 3, 2023
17 checks passed
@dmiseev dmiseev deleted the feature/cc-29651/dev-click-and-collect-integration branch November 3, 2023 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danilmoro3 danilmoro3 danilmoro3 left review comments

@FRITS-Kh FRITS-Kh FRITS-Kh approved these changes

@abitskil abitskil abitskil approved these changes

Assignees
No one assigned
Labels
ready-for-release
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@romanhavrylko @abitskil @FRITS-Kh @danilmoro3 @dmiseev @kkicheglovspryker